Skip to content

Commit

Permalink
Fix set_param in several layers that were rejecting parameters from f…
Browse files Browse the repository at this point in the history
…iles with old format.
  • Loading branch information
genete committed Aug 29, 2013
1 parent 8707d3a commit 1c6c0b3
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 15 deletions.
2 changes: 1 addition & 1 deletion synfig-core/src/modules/lyr_freetype/lyr_freetype.cpp
Expand Up @@ -531,7 +531,7 @@ Layer_Freetype::set_param(const String & param, const ValueBase &value)
IMPORT_VALUE_PLUS(param_grid_fit,needs_sync_=true);

if(param=="pos")
set_param("origin", value);
return set_param("origin", value);

return Layer_Composite::set_param(param,value);
}
Expand Down
2 changes: 1 addition & 1 deletion synfig-core/src/modules/lyr_std/curvewarp.cpp
Expand Up @@ -368,7 +368,7 @@ CurveWarp::set_param(const String & param, const ValueBase &value)
IMPORT_VALUE_PLUS(param_bline, sync());

if(param=="offset")
set_param("origin", value);
return set_param("origin", value);

return false;
}
Expand Down
2 changes: 1 addition & 1 deletion synfig-core/src/modules/lyr_std/shade.cpp
Expand Up @@ -121,7 +121,7 @@ Layer_Shade::set_param(const String &param, const ValueBase &value)
IMPORT_VALUE(param_invert);

if(param=="offset")
set_param("origin", value);
return set_param("origin", value);

return Layer_Composite::set_param(param,value);
}
Expand Down
4 changes: 1 addition & 3 deletions synfig-core/src/modules/lyr_std/sphere_distort.cpp
Expand Up @@ -104,9 +104,7 @@ Layer_SphereDistort::set_param(const String & param, const ValueBase &value)
IMPORT_VALUE(param_clip);

if(param=="percent" && param_amount.get_type()==value.get_type())
{
set_param("amount", value);
}
return set_param("amount", value);

return Layer::set_param(param,value);
}
Expand Down
2 changes: 1 addition & 1 deletion synfig-core/src/modules/lyr_std/xorpattern.cpp
Expand Up @@ -77,7 +77,7 @@ XORPattern::set_param(const String & param, const ValueBase &value)
IMPORT_VALUE(param_size);

if(param=="pos")
set_param("origin", value);
return set_param("origin", value);

return Layer_Composite::set_param(param,value);
}
Expand Down
2 changes: 1 addition & 1 deletion synfig-core/src/modules/mod_filter/halftone2.cpp
Expand Up @@ -124,7 +124,7 @@ Halftone2::set_param(const String & param, const ValueBase &value)
HALFTONE2_IMPORT_VALUE(halftone.param_origin);

if(param=="offset")
set_param("origin", value);
return set_param("origin", value);

return Layer_Composite::set_param(param,value);
}
Expand Down
2 changes: 1 addition & 1 deletion synfig-core/src/modules/mod_geometry/checkerboard.cpp
Expand Up @@ -111,7 +111,7 @@ CheckerBoard::set_param(const String &param, const ValueBase &value)
IMPORT_VALUE(param_size);

if(param=="pos")
set_param("origin", value);
return set_param("origin", value);

for(int i=0;i<2;i++)
if(param==strprintf("pos[%d]",i) && value.get_type()==ValueBase::TYPE_REAL)
Expand Down
4 changes: 1 addition & 3 deletions synfig-core/src/modules/mod_geometry/circle.cpp
Expand Up @@ -104,9 +104,7 @@ Circle::ImportParameters(const String &param, const ValueBase &value)
IMPORT_VALUE(param_origin);
IMPORT_VALUE(param_falloff);
if(param=="pos")
{
ImportParameters("origin",value);
}
return ImportParameters("origin",value);

return Layer_Composite::set_param(param,value);
}
Expand Down
2 changes: 1 addition & 1 deletion synfig-core/src/modules/mod_gradient/curvegradient.cpp
Expand Up @@ -518,7 +518,7 @@ CurveGradient::set_param(const String & param, const ValueBase &value)
IMPORT_VALUE(param_fast);

if(param=="offset")
set_param("origin", value);
return set_param("origin", value);

return Layer_Composite::set_param(param,value);
}
Expand Down
4 changes: 2 additions & 2 deletions synfig-core/src/modules/mod_particle/plant.cpp
Expand Up @@ -352,9 +352,9 @@ Plant::set_param(const String & param, const ValueBase &value)
IMPORT_VALUE(param_use_width);

if(param=="offset")
set_param("origin", value);
return set_param("origin", value);
if(param=="seed")
set_param("random", value);
return set_param("random", value);

return Layer_Composite::set_param(param,value);
}
Expand Down

0 comments on commit 1c6c0b3

Please sign in to comment.